ExtractArchiveJob: Fixes job not stopping when cancelled by user, also changes state to use "cancelled" instead of "terminated" #2008
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes: SIRI-972
Fixes: SIRI-972
If it was cancelled we set the state to "cancelled" instead of "terminated" Fixes: SIRI-972
idlira
requested changes
Jun 17, 2024
| @@ -599,7 +599,12 @@ protected boolean markCompleted(String processId, | |||
| return modify(processId, process -> process.getState() != ProcessState.TERMINATED, process -> { | |||
| if (process.getState() != ProcessState.STANDBY) { | |||
| process.setErrorneous(process.isErrorneous() || !TaskContext.get().isActive()); | |||
| process.setState(ProcessState.TERMINATED); | |||
| //Do not alter the job state if the job was previously cancelled by the user | |||
| if (process.getState() != ProcessState.CANCELED) { | |||
There was a problem hiding this comment.
on a second thought, it will be a bit more robust if we specifically check for cancelations.
If the job was cancelled, both date and status will be already set.
if (process.getCancelled() == null) {
process.setState(ProcessState.TERMINATED);
process.setCompleted(LocalDateTime.now());
}OR
if (process.getState() != ProcessState.CANCELED) {
process.setState(ProcessState.TERMINATED);
process.setCompleted(LocalDateTime.now());
}| process.setState(ProcessState.TERMINATED); | ||
| } else { | ||
| process.setState(ProcessState.CANCELED); | ||
| } | ||
| process.setCompleted(LocalDateTime.now()); |
There was a problem hiding this comment.
Moved in the if above as the date goes along with the status
jakobvogel
approved these changes
Jun 17, 2024
mko-sci
approved these changes
Jun 17, 2024
sabieber
approved these changes
Jun 18, 2024
Fixes: SIRI-972
Fixes: SIRI-972
sabieber
approved these changes
Jun 18, 2024
Fixes: SIRI-972
Fixes: SIRI-972
jakobvogel
approved these changes
Jun 18, 2024
sabieber
approved these changes
Jun 18, 2024
idlira
approved these changes
Jun 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Before:
Still unpacking:
After unpacking:
After fixes:
Additional Notes
Checklist